3.4: Update gdm patch, enable consolekit

diff --git a/gnomeos/3.4/gdm-disable-documentation.patch b/gnomeos/3.4/gdm-disable-documentation.patch
index a88efc353b9a47b1c5e453869b0799790087804e..dd0e7024966ca27d937217da74ffedc2a08510f4 100644 (file)
--- a/gnomeos/3.4/gdm-disable-documentation.patch
+++ b/gnomeos/3.4/gdm-disable-documentation.patch
@@ -1,4 +1,4 @@
-From d2e7caf3b67bc76d7354a20344505ba22f877de7 Mon Sep 17 00:00:00 2001
+From 06a5d03ae1abd70fd0f5c6eb37ce26dee1490f7d Mon Sep 17 00:00:00 2001
 From: Colin Walters <walters@verbum.org>
 Date: Sun, 15 Jan 2012 16:49:07 -0500
 Subject: [PATCH] build: Add --disable-documentation
@@ -7,15 +7,15 @@ Documentation is the source of many cyclical build loops.  Allow
 operating system builders to manually cut these cycles initially
 by disabling documentation for a first pass.
 ---
- Makefile.am  |    8 +++++++-
+ Makefile.am  |    4 +++-
  configure.ac |    4 ++++
- 2 files changed, 11 insertions(+), 1 deletions(-)
+ 2 files changed, 7 insertions(+), 1 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index f522f40..3f00a16 100644
+index f522f40..2d0443d 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -4,12 +4,18 @@ SUBDIRS =                    \
+@@ -4,12 +4,14 @@ SUBDIRS =                    \
        data                    \
        common                  \
        daemon                  \
@@ -25,18 +25,14 @@ index f522f40..3f00a16 100644
        po                      \
        tests                   \
        $(NULL)
-+DIST_SUBDIRS =
-+
 +if ENABLE_DOCUMENTATION
 +SUBDIRS += docs
-+else
-+DIST_SUBDIRS += docs
 +endif
  
  # add these when help gets added back
  # omf-install
 diff --git a/configure.ac b/configure.ac
-index 30397c5..291627c 100644
+index 3c94f94..f3934a5 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -44,6 +44,10 @@ AC_CONFIG_MACRO_DIR([m4])
@@ -51,5 +47,5 @@ index 30397c5..291627c 100644
  GETTEXT_PACKAGE=gdm
  AC_SUBST(GETTEXT_PACKAGE)
 -- 
-1.7.6.4
+1.7.6.5
 

diff --git a/gnomeos/3.4/manifest.json b/gnomeos/3.4/manifest.json
index 67bddd3dc60cb97fa9d2cc801545464e4227bf3c..ea3e62568e1ea7a2c1d29c648351b9480594881e 100644 (file)
--- a/gnomeos/3.4/manifest.json
+++ b/gnomeos/3.4/manifest.json
@@ -677,7 +677,8 @@
                 "patches": ["accountsservice-builddir.patch"]},
 
                {"src": "gnome:gdm",
-                "config-opts": ["--disable-documentation"],
+                "config-opts": ["--disable-documentation",
+                                "--with-consolekit"],
                 "patches": ["gdm-disable-documentation.patch",
                             "gdm-pam-auth.patch"]},